fix regression from c/s 23735:537918f518ee

This was checking presence of the wrong (old) ELF note. I don't really
understand how this failed consistently only for one of the xen-boot
tests...

Signed-off-by: Jan Beulich <jbeulich@novell.com>

diff --git a/xen/arch/ia64/xen/domain.c b/xen/arch/ia64/xen/domain.c
index 957c288710c8e06db84d9915272375eeafe0674e..fd7c13c4a270f775767f0db3946e2d52f751d483 100644 (file)
--- a/xen/arch/ia64/xen/domain.c
+++ b/xen/arch/ia64/xen/domain.c
@@ -2164,7 +2164,7 @@ int __init construct_dom0(struct domain *d,
                return -1;
        }
 
-       if (parms.elf_notes[XEN_ELFNOTE_FEATURES].type != XEN_ENT_NONE &&
+       if (parms.elf_notes[XEN_ELFNOTE_SUPPORTED_FEATURES].type != XEN_ENT_NONE &&
            !test_bit(XENFEAT_dom0, parms.f_supported))
        {
                printk("Kernel does not support Dom0 operation\n");

diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c
index 8d58291c33c2b116b3a59b32e95cf54788f74d4d..d7697e562b921424be31ec7c3d4230c55de2ba76 100644 (file)
--- a/xen/arch/x86/domain_build.c
+++ b/xen/arch/x86/domain_build.c
@@ -415,7 +415,7 @@ int __init construct_dom0(
         return -EINVAL;
     }
 
-    if ( parms.elf_notes[XEN_ELFNOTE_FEATURES].type != XEN_ENT_NONE &&
+    if ( parms.elf_notes[XEN_ELFNOTE_SUPPORTED_FEATURES].type != XEN_ENT_NONE &&
          !test_bit(XENFEAT_dom0, parms.f_supported) )
     {
         printk("Kernel does not support Dom0 operation\n");